From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 24 Jun 2016 16:19:40 +0000 (+0200)
Subject: workspacesView: Consider workspaces-only-on-primary when panning
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~825
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=21ddbf0b8f5a12f9cd1eeb976f8037eafc3c3abe;p=gnome-shell.git

workspacesView: Consider workspaces-only-on-primary when panning

It is odd to switch workspaces on the primary monitor when panning on
a monitor without workspaces, so reject the gesture on non-primary
monitors when workspaces-only-on-primary is disabled.

https://bugzilla.gnome.org/show_bug.cgi?id=766883
---

diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index f8217cffd..2eacb5f2d 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -437,6 +437,12 @@ const WorkspacesDisplay = new Lang.Class({
         let panAction = new Clutter.PanAction({ threshold_trigger_edge: Clutter.GestureTriggerEdge.AFTER });
         panAction.connect('pan', Lang.bind(this, this._onPan));
         panAction.connect('gesture-begin', Lang.bind(this, function() {
+            if (this._workspacesOnlyOnPrimary) {
+                let event = Clutter.get_current_event();
+                if (this._getMonitorIndexForEvent(event) != this._primaryIndex)
+                    return false;
+            }
+
             for (let i = 0; i < this._workspacesViews.length; i++)
                 this._workspacesViews[i].startSwipeScroll();
             return true;